diff --git a/system/libraries/Upload.php b/system/libraries/Upload.php
index 271c6d2..7456e92 100644
--- a/system/libraries/Upload.php
+++ b/system/libraries/Upload.php
@@ -747,6 +747,8 @@
 				';',
 				'?',
 				'/',
+				'!',
+				'#',
 				'%20',
 				'%22',
 				'%3c',		// <
diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 8ddeb0e..8ee224f 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -215,6 +215,7 @@
 -  Fixed a bug (#1314) - sess_destroy() did not destroy userdata.
 -  Fixed a bug (#1349) - get_extension() in the :doc:`File Uploading Library <libraries/file_uploading>` returned the original filename when it didn't have an actual extension.
 -  Fixed a bug (#1273) - E_NOTICE being generated by :doc:`Query Builder <database/query_builder>`'s set_update_batch() method.
+-  Fixed a bug (#44, #110) - :doc:`Upload library <libraries/file_uploading>`'s clean_file_name() method didn't clear '!' and '#' characters.
 
 Version 2.1.1
 =============